From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 14 May 2010 09:20:34 +0000 (+0000)
Subject: firmware-utils/mkzynfw: don't use next_offset twice (closes #7273)
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=3a5c67fc3afea25c0abcd3fdd36b256b2aeeb72d;p=project%2Ffirmware-utils.git

firmware-utils/mkzynfw: don't use next_offset twice (closes #7273)

The test if a file can fit in an image considers the current offset
twice. So a image that would fit is too big.

Thanks-to: Michael Kurz <michi.kurz@googlemail.com>

SVN-Revision: 21445
---

diff --git a/src/mkzynfw.c b/src/mkzynfw.c
index 5c1bc24..9018ea1 100644
--- a/src/mkzynfw.c
+++ b/src/mkzynfw.c
@@ -983,7 +983,7 @@ calc_block_offsets(int type, uint32_t *offset)
 
 		next_offs = ALIGN(*offset, block->align);
 		avail = board->flash_size - board->romio_offs - next_offs;
-		if (next_offs + block->file_size > avail) {
+		if (block->file_size > avail) {
 			ERR("file %s is too big, offset = %u, size=%u,"
 				" align = %u", block->file_name,
 				(unsigned)next_offs,